Fix & add new feature