Nothing special, minor modifications