Cleaned code from previous merge.