Made a few conditional blocks instead of comments