added priority and stuff