fixed code/tweaked  previous commit