more work on magic1