method working, need fixed