merged some stuff yo