need to work on that
update working issues