started implementing more