Implement little bit more