altered some changes made during the SDK integration