Removed getters and setters
Enabled ED