Some more work on stuffs