changed if statement
finished remaining methods