re written everything in resource bundle..