Updated with fixes