Added correct things now, fixed overflow