Addressing last comments (hopefully ^^)