Making progress.. added protection