now
resolve issues