Addressed soxleys comments