Work on build states