Added some preview only code

Code not tested