ok now it shoudl be functional again