latest changes tested to be working