Adding changes from JSA Dev