Tries to simplify stuff a bit further