added features phil suggested