pushing some small changes, added a dynamic z