fixed fucking mess