Switch to flatstrap