C3 marwa mehanna #86 bootstrap

@Dayna161193 @mahmoudhashish @muhammedabuali please review