Some more work on halloween1 and 2