More awesome changes ^^