Resolved Some Issues