fixes, moved methods to new controllers