Reverted Giacom's changes