update to 1.1 and marvel