Changed implementation

Allows future scheduling