Updated

Made some changes to meet some requirements that were previously left
out.