Change code to be better...