rolled back

previous version riddled with bugs