Fixed scheduler. Added Memory