improvements bug resolves