adding refund magic --still commented