fixing issues, it works now!