Updates based on @shoonoise recommendations