Bebas hardcoded and few tweaks