Implementing all changes from the st blue app