improvements on features