Moved some code & modified pro