Fixing bugs
Looking for simplicity