Updated for spring 2015 semester