Removed some methods - added debug lines