[BS-6] Final touches