Updated - requirements finished