EAGLE-Removed logging and if statement :