update
looks better
massive wip