restyles and merges rica's branch