added aloha editing