Reverting Tomy's changes