some cosmetci changes not finished yet