Improve magic numbers - better dynamics