Try to make things a bit easier, hopefully not breaking shit.