Rollback implementation

Modified to rely on my own, rolled back implementation