fixing and dooodleing