2016 feature rewritten

Modified