still fixing the above issue