Commented out code I do not like... :smile: