Reverted back which was used for testmode