Change 3

Fixed previous problems