Changes for coding