need to fix methods