optimization and warning removement
bubble creation optimizations