Fixed things as requested