Started fixing black box