Added everything for second task