Made changes to make everything work on GCW Zero