Some new changes to simplify code