Some changes. Project in stand-by for now.