Added fixed codes