removed bootstrap and fixed forwarding