Modifications after talking to pbassiner