Made functional improvements