fixed most of functionality