updated code, good scene