added omar's changes, whatever they may be...