changes made by Boji 05/12/2013 6:38PM