Client side: Moved block of code