finished all extra things