modify to handle conditions appropriately on :load command