Changes for bugs
Latest changes
test