trying to get things fixed
finally completely working