separate files
fix methods