WIP Bass rework (about timing issue)