Slight code changes...