Added bounds control