Modified feature

Please review/merge.