Reverted to original technique and repaired scaling issues