Some More hard Code and Resolution updated