Added new feature

I think this should do it.