still trying to fix declaration conflicts