Finally, seems to be working