Edited for use on CRITFC development environment