almost finished support beautification