made some changes to make requirement 6 even though requirement 5 still does not work.