Merged master and made adjustments to level/tick