Working gameplay improved