(#1234) added some new stuff.

this new stuff is really really needed.