Updated custom block