New version, #39

Try to solve sentry problems