removed fixtures and added in return