Starting to change the code a bit...