woooo almost there changes