making changes to run in my environment
updated for 2014b
updated for 2014b