added bp support move and removed unused variables