Changes from both devs