Brought up to functionality, again.
Updated for whitespace