Basic changes working further