tried to fix it a bit