Added some ifdef statement. Still debugging