Finish impl. of new features