Hard Code Changges