Further changes and variables stuff