Refactored, added Pitfall