Changes #Fixed 6