adding some small changes, currently not working (still in dev)