Trying to restore broken features and some polishing