Trying to simplify everything