Fixed overflow; Updated alignment