fixed method definitions and spec