kinda better, will continue later