Modifications after some testing