small changes (working)