ficing mainly tests but there is still a problem need to look in it