made simpler and shit