Made some minor changes and removing LOGTAGS