Change code a bit