tested on dev. testing on proxy