my initial
fixed commits