Okay that's apparently important
slight tweaks
Don't split so much