Added Checks and Math methods