Implemented features #1