Remove forwards
Fix bug
Fix
For testing