Some issues..need to resolve them