Added new feature which is now safe.

Blah blah blah