BUG 4 AND 5

Comments