Base logic added
Base logic added