Pull Request Dev_1.0

magic numbers po. please change to constant :bow: