@eddiemonge: check the latest patch. Like I said I would just keep those in one line, but I guess your suggestion looks better than the current way.