Fixed misusing of constants and commented WIP part