Added features 5 and 6, all main features have been added