Added bound in case of no activation
Rewrote using a structure to allow for one-time read