4/24/14 - massive changes