Cleaned up input groups
0.13.2